API: GdkWindow no longer is a GdkDrawable

Also, name the get_type function properly.

diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 721e733b850a6c8691f702e56521dd6a3bc857a5..24b09562e70fc18b8b2f9db0be7a308426083dad 100644 (file)
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -184,7 +184,7 @@ typedef void (* GdkDisplayPointerInfoForeach) (GdkDisplay           *display,
 
 struct _GdkWindow
 {
-  GdkDrawable parent_instance;
+  GObject parent_instance;
 
   GdkDrawable *impl; /* window-system-specific delegate object */  
   

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index c746764756f611c937f14a97dde622902e94ea81..a03e52ec12b501a3f4bc59a66f6b403430d0e177 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -278,12 +278,12 @@ new_region_tag (void)
 }
 
 GType
-gdk_window_object_get_type (void)
+gdk_window_get_type (void)
 {
   static GType object_type = 0;
 
   if (!object_type)
-    object_type = g_type_register_static_simple (GDK_TYPE_DRAWABLE,
+    object_type = g_type_register_static_simple (G_TYPE_OBJECT,
                                                 "GdkWindow",
                                                 sizeof (GdkWindowObjectClass),
                                                 (GClassInitFunc) gdk_window_class_init,

diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index 4e408ca86ab10734451443c410db36fc3b79e142..cf088b328db50ee8916b482ac8c91faa6392006e 100644 (file)
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -478,7 +478,7 @@ struct _GdkPointerHooks
 typedef struct _GdkWindowObject GdkWindowObject;
 typedef struct _GdkWindowObjectClass GdkWindowObjectClass;
 
-#define GDK_TYPE_WINDOW              (gdk_window_object_get_type ())
+#define GDK_TYPE_WINDOW              (gdk_window_get_type ())
 #define GDK_WINDOW(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WINDOW, GdkWindow))
 #define GDK_WINDOW_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_WINDOW, GdkWindowObjectClass))
 #define GDK_IS_WINDOW(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WINDOW))
@@ -488,7 +488,7 @@ typedef struct _GdkWindowObjectClass GdkWindowObjectClass;
 
 struct _GdkWindowObjectClass
 {
-  GdkDrawableClass parent_class;
+  GObjectClass      parent_class;
 
   GdkWindow       * (* pick_embedded_child) (GdkWindow *window,
                                              gdouble    x,
@@ -522,7 +522,7 @@ struct _GdkWindowObjectClass
 
 /* Windows
  */
-GType         gdk_window_object_get_type       (void) G_GNUC_CONST;
+GType         gdk_window_get_type              (void) G_GNUC_CONST;
 GdkWindow*    gdk_window_new                   (GdkWindow     *parent,
                                                 GdkWindowAttr *attributes,
                                                 gint           attributes_mask);